Skip to content

fix(tests): Replace removed egg syntax for installing client in CI#8496

Merged
aldbr merged 2 commits intoDIRACGrid:integrationfrom
maxnoe:fix-egg-install
Apr 7, 2026
Merged

fix(tests): Replace removed egg syntax for installing client in CI#8496
aldbr merged 2 commits intoDIRACGrid:integrationfrom
maxnoe:fix-egg-install

Conversation

@maxnoe
Copy link
Copy Markdown
Contributor

@maxnoe maxnoe commented Apr 2, 2026

Trying to fix the integration tests that fails due to unsupported dependency format for pip.

BEGINRELEASENOTES
ENDRELEASENOTES

@maxnoe maxnoe force-pushed the fix-egg-install branch from c2a139b to d6af90a Compare April 2, 2026 15:33
@aldbr
Copy link
Copy Markdown
Contributor

aldbr commented Apr 2, 2026

I just came across the same issue. Could you please also adjust

DIRAC/src/DIRAC/FrameworkSystem/Service/SystemAdministratorHandler.py

Lines 262 to 276 in 107503c

- "integration" or "devel" or "master" or "main" would all be interpreted as git+https://github.com/DIRACGrid/DIRAC.git@integration#egg=DIRAC[server]
- a git tag/branch like git+https://github.com/fstagni/DIRAC.git@test_branch#egg=DIRAC[server]
"""
# Validate and normalise the requested version
primaryExtension = None
if "==" in version:
primaryExtension, version = version.split("==")
released_version = True
isPrerelease = False
# Special cases (e.g. installing the integration/main branch)
if version.lower() in ["integration", "devel", "master", "main"]:
released_version = False
version = "git+https://github.com/DIRACGrid/DIRAC.git@integration#egg=DIRAC[server]"

And

DIRAC/docs/source/AdministratorGuide/HowTo/SystemAdministratorInterface.rst

Lines 251 to 270 in 107503c

Updating the DIRAC installation
---------------------------------
The SAC allows to update DIRAC, or its extension, to a version. Use extension_name==version for the DIRAC extension.
A version can be:
* a PEP440 valid version of DIRAC.
* a PEP440 valid version of a DIRAC extension.
* "integration" or "devel" or "master" or "main" would all be interpreted as git+https://github.com/DIRACGrid/DIRAC.git@integration#egg=DIRAC[server]
* a git tag/branch like git+https://github.com/fstagni/DIRAC.git@test_branch#egg=DIRAC[server]
Usage::
update <version>
For example::
update 9.0.18
update integration
update git+https://github.com/fstagni/DIRAC.git@test_branch#egg=DIRAC[server]

@aldbr
Copy link
Copy Markdown
Contributor

aldbr commented Apr 2, 2026

Linked to that: DIRACGrid/Pilot#280

@maxnoe maxnoe force-pushed the fix-egg-install branch from d6af90a to 469fa56 Compare April 2, 2026 16:13
@maxnoe
Copy link
Copy Markdown
Contributor Author

maxnoe commented Apr 2, 2026

Not totally sure about the changes in DIRAC/src/DIRAC/FrameworkSystem/Service/SystemAdministratorHandler.py, but I tried adding a converter there

@maxnoe
Copy link
Copy Markdown
Contributor Author

maxnoe commented Apr 2, 2026

@aldbr Is the failing CI using some docker container or another remote / cached version? Because I'm pretty sure that's the line I changed here

@chrisburr chrisburr mentioned this pull request Apr 7, 2026
Merged
@chrisburr
Copy link
Copy Markdown
Member

chrisburr commented Apr 7, 2026

The failing CI is explicitly installing a v8 client, I've backported this in #8498

@maxnoe
Copy link
Copy Markdown
Contributor Author

maxnoe commented Apr 7, 2026

Ah, it is installing it using the installation script from that branch? I had assumed it was using the current installation script to install an old package version.

@fstagni fstagni closed this Apr 7, 2026
@fstagni fstagni reopened this Apr 7, 2026
fstagni
fstagni reviewed Apr 7, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@fstagni fstagni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also update the doc in SystemAdministratorInterface.rst ?

@maxnoe
Copy link
Copy Markdown
Contributor Author

maxnoe commented Apr 7, 2026

@fstagni I think I did?

https://github.com/DIRACGrid/DIRAC/pull/8496/changes#diff-3b6e560d0d73d970b94ace920e2f16c7188905ad9139f3e98a6f29aa98646203

Something missing?

@chrisburr chrisburr marked this pull request as ready for review April 7, 2026 11:01
@aldbr aldbr merged commit 520bfb9 into DIRACGrid:integration Apr 7, 2026
26 of 27 checks passed
@DIRACGridBot DIRACGridBot added the sweep:ignore Prevent sweeping from being ran for this PR label Apr 7, 2026
@maxnoe maxnoe deleted the fix-egg-install branch April 7, 2026 12:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fstagni fstagni fstagni left review comments

@aldbr aldbr aldbr approved these changes

@andresailer andresailer Awaiting requested review from andresailer andresailer is a code owner

@atsareg atsareg Awaiting requested review from atsareg atsareg is a code owner

Assignees

No one assigned

Labels

sweep:ignore Prevent sweeping from being ran for this PR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@maxnoe @aldbr @chrisburr @fstagni @DIRACGridBot